fix various "Redundancies in code" (#1178)

* fix "Redundant elaborted type specifier"

* fix "Redundant 'inline' specifier"

* fix "redundant 'const' specifier on a constexpr variable"

* remove "Redundant qualifier"

* add /out/, /.vs/ to .gitignore, and sort.

diff --git a/.gitignore b/.gitignore
index 8da97ca49cfe94858978b78fa852d822101c995a..6d7d77f6902f371470706d270cde59c6a4b3d23d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,21 @@
+*.a
+*.o
+*.swp
+.ninja_deps
+.ninja_log
+.qmake.cache
+.qmake.stash
+.qt
+/*.gcda
+/*.gcno
+/*.gcov
+/.vs/
+/.vscode/
+/GPSBabel
+/GPSBabel[0-9]*.[0-9]*.[0-9]*.tar.bz2
+/GPSBabel[0-9]*.[0-9]*.[0-9]*/
+/Makefile
+/autogen/
 /autom4te.cache/
 /babelweb/
 /bld/
@@ -8,46 +26,30 @@
 /config.status
 /cscope.out
 /debug/
+/empty
+/gbversion.h
 /gpsbabel
 /gpsbabel-debug
 /gpsbabel.exe
 /gpsbabel.fo
+/gpsbabel.gch/
 /gpsbabel.html
 /gpsbabel.pdf
+/gpsbabel.rc
 /gpsbabel_autogen/
 /gpsbabel_coverage.xml
-/Makefile
-.qmake.cache
-.qmake.stash
-/GPSBabel
-/*.gcda
-/*.gcno
-/*.gcov
-*.o
-*.a
-.ninja_deps
-.ninja_log
-.qt
-build.ninja
-rules.ninja
-cmake_install.cmake
-CMakeCache.txt
-CMakeFiles/
-CTestTestfile.cmake
-/GPSBabel[0-9]*.[0-9]*.[0-9]*/
-/GPSBabel[0-9]*.[0-9]*.[0-9]*.tar.bz2
+/makedoc
 /makelinuxdist.sh
+/mkcapabilities
 /objects/
+/out/
+/qrc_gpsbabel.cpp
 /release/
-*.swp
 /tmp/
-/mkcapabilities
-/gpsbabel.gch/
-/gpsbabel.rc
-/autogen/
-/makedoc
-/empty
-/gbversion.h
-/qrc_gpsbabel.cpp
-/.vscode/
+CMakeCache.txt
+CMakeFiles/
+CTestTestfile.cmake
 Testing
+build.ninja
+cmake_install.cmake
+rules.ninja

diff --git a/exif.h b/exif.h
index 3c0a9f85e3023a089da37e6d64b8bf6932cec5ff..2be58dedaf4333b159ed83d5e8b044a8934e73ca 100644 (file)
--- a/exif.h
+++ b/exif.h
@@ -115,7 +115,7 @@ private:
     // Return data value interpreted as EXIF_TYPE_LONG.
     // This is most useful when the type is EXIF_TYPE_LONG and the count is one,
     // which occurs for multiple specific tags where we need the value.
-    inline uint32_t toLong() const
+    uint32_t toLong() const
     {
       return data.at(0).value<uint32_t>();
     }

diff --git a/garmin.cc b/garmin.cc
index 159d3c02d9013db8ae6c16a5fb2768ad218c0edf..1382f9eadc7e219d5dcd9526809368cd23915a8c 100644 (file)
--- a/garmin.cc
+++ b/garmin.cc
@@ -484,7 +484,7 @@ waypt_read()
   }
 }
 
-static int lap_read_nop_cb(int, struct GPS_SWay**)
+static int lap_read_nop_cb(int, GPS_SWay**)
 {
   return 0;
 }
@@ -864,7 +864,7 @@ waypoint_prepare()
   extern WaypointList* global_waypoint_list;
   int icon;
 
-  tx_waylist = (struct GPS_SWay**) xcalloc(n,sizeof(*tx_waylist));
+  tx_waylist = (GPS_SWay**) xcalloc(n,sizeof(*tx_waylist));
 
   for (i = 0; i < n; i++) {
     tx_waylist[i] = sane_GPS_Way_New();
@@ -1057,7 +1057,7 @@ route_write()
 {
   int n = 2 * route_waypt_count(); /* Doubled for the islink crap. */
 
-  tx_routelist = (struct GPS_SWay**) xcalloc(n,sizeof(GPS_PWay));
+  tx_routelist = (GPS_SWay**) xcalloc(n,sizeof(GPS_PWay));
   cur_tx_routelist_entry = tx_routelist;
 
   for (int i = 0; i < n; i++) {
@@ -1104,7 +1104,7 @@ track_prepare()
 {
   int32 n = track_waypt_count() + track_count();
 
-  tx_tracklist = (struct GPS_STrack**) xcalloc(n, sizeof(GPS_PTrack));
+  tx_tracklist = (GPS_STrack**) xcalloc(n, sizeof(GPS_PTrack));
   cur_tx_tracklist_entry = tx_tracklist;
   for (int i = 0; i < n; i++) {
     tx_tracklist[i] = GPS_Track_New();

diff --git a/garmin_gpi.h b/garmin_gpi.h
index 5594f6ffc9af813b47916673bc43380a8e2e341e..cdc972eb38d960fd9419cf80a9093d76fa4c034f 100644 (file)
--- a/garmin_gpi.h
+++ b/garmin_gpi.h
@@ -293,11 +293,11 @@ private:
   static bool compare_wpt_cb(const Waypoint* a, const Waypoint* b);
   static char compare_strings(const QString& s1, const QString& s2);
   static writer_data_t* wdata_alloc();
-  static void wdata_free(GarminGPIFormat::writer_data_t* data);
-  static void wdata_add_wpt(GarminGPIFormat::writer_data_t* data, Waypoint* wpt);
-  void wdata_check(GarminGPIFormat::writer_data_t* data) const;
-  int wdata_compute_size(GarminGPIFormat::writer_data_t* data) const;
-  void wdata_write(const GarminGPIFormat::writer_data_t* data) const;
+  static void wdata_free(writer_data_t* data);
+  static void wdata_add_wpt(writer_data_t* data, Waypoint* wpt);
+  void wdata_check(writer_data_t* data) const;
+  int wdata_compute_size(writer_data_t* data) const;
+  void wdata_write(const writer_data_t* data) const;
   void write_category(const char* unused, const unsigned char* image, int image_sz) const;
   void write_header() const;
   void enum_waypt_cb(const Waypoint* ref) const;

diff --git a/garmin_txt.cc b/garmin_txt.cc
index 5fd72a8700387d278578641b8bba8cf79d2d143f..8720621a10522a71a5b19e268adbe931dc550fb8 100644 (file)
--- a/garmin_txt.cc
+++ b/garmin_txt.cc
@@ -124,7 +124,7 @@ static constexpr double kGarminUnknownAlt = 1.0e25;
 static constexpr char kDefaultDateFormat[] = "dd/mm/yyyy";
 static constexpr char kDefaultTimeFormat[] = "HH:mm:ss";
 
-static inline bool is_valid_alt(double alt)
+static bool is_valid_alt(double alt)
 {
   return (alt != unknown_alt) && (alt < kGarminUnknownAlt);
 }

diff --git a/googletakeout.cc b/googletakeout.cc
index d4b82f88231b5c89a04ed3e5b36c32532c6760e2..af824ae231283501b932a089ed05d6007e0b7b58 100644 (file)
--- a/googletakeout.cc
+++ b/googletakeout.cc
@@ -48,11 +48,11 @@ static const QList<QString> takeout_month_names{
   "AUGUST", "SEPTEMBER", "OCTOBER", "NOVEMBER", "DECEMBER"
 };
 
-static inline void takeout_fatal(const QString& message) {
+static void takeout_fatal(const QString& message) {
   fatal(FatalMsg() << MYNAME << ": " << message);
 }
 
-static inline void takeout_warning(const QString& message) {
+static void takeout_warning(const QString& message) {
   Warning() << MYNAME << ": " << message;
 }
 

diff --git a/igc.cc b/igc.cc
index c26814354f5223107f04695f49339ab237f31b01..ba643762bb7bb8f5b2d92d92721c9ba37e62fcf4 100644 (file)
--- a/igc.cc
+++ b/igc.cc
@@ -467,7 +467,7 @@ void IgcFormat::read()
         int len = end - begin + 1;
         QString name = extension_definition.mid(4,3);
         igc_ext_type_t ext = get_ext_type(ext_type);
-        if (ext != IgcFormat::igc_ext_type_t::ext_rec_unknown) {
+        if (ext != igc_ext_type_t::ext_rec_unknown) {
           int factor = get_ext_factor(ext);
           ext_types_list.append(std::make_tuple(name, ext, begin, len, factor));
           supported_extensions.append(name);

diff --git a/igc.h b/igc.h
index d0672811e5117c50fdc7be45def184a35544bf76..17c6bdaa18fb78c573b4fba4ebcbd68cc5c0cdd5 100644 (file)
--- a/igc.h
+++ b/igc.h
@@ -131,17 +131,17 @@ private:
     rec_bad = 1,               // Bad record
   };
 
-  const QHash<QString, IgcFormat::igc_ext_type_t> igc_extension_map{
-    {"ENL", IgcFormat::igc_ext_type_t::ext_rec_enl},
-    {"TAS", IgcFormat::igc_ext_type_t::ext_rec_tas},
-    {"VAT", IgcFormat::igc_ext_type_t::ext_rec_vat},
-    {"OAT", IgcFormat::igc_ext_type_t::ext_rec_oat},
-    {"TRT", IgcFormat::igc_ext_type_t::ext_rec_trt},
-    {"GSP", IgcFormat::igc_ext_type_t::ext_rec_gsp},
-    {"FXA", IgcFormat::igc_ext_type_t::ext_rec_fxa},
-    {"SIU", IgcFormat::igc_ext_type_t::ext_rec_siu},
-    {"ACZ", IgcFormat::igc_ext_type_t::ext_rec_acz},
-    {"GFO", IgcFormat::igc_ext_type_t::ext_rec_gfo},
+  const QHash<QString, igc_ext_type_t> igc_extension_map{
+    {"ENL", igc_ext_type_t::ext_rec_enl},
+    {"TAS", igc_ext_type_t::ext_rec_tas},
+    {"VAT", igc_ext_type_t::ext_rec_vat},
+    {"OAT", igc_ext_type_t::ext_rec_oat},
+    {"TRT", igc_ext_type_t::ext_rec_trt},
+    {"GSP", igc_ext_type_t::ext_rec_gsp},
+    {"FXA", igc_ext_type_t::ext_rec_fxa},
+    {"SIU", igc_ext_type_t::ext_rec_siu},
+    {"ACZ", igc_ext_type_t::ext_rec_acz},
+    {"GFO", igc_ext_type_t::ext_rec_gfo},
   };
 
   // Will return zero if no match
@@ -161,38 +161,38 @@ private:
    * A factor can never be zero, so this looks good to me.
    * Be careful.
    */
-  int get_ext_factor(IgcFormat::igc_ext_type_t type) const
+  int get_ext_factor(igc_ext_type_t type) const
   {
     int ret = 0;
     switch (type) {
-    case IgcFormat::igc_ext_type_t::ext_rec_enl:
+    case igc_ext_type_t::ext_rec_enl:
       ret = 1;
       break;
-    case IgcFormat::igc_ext_type_t::ext_rec_tas:
+    case igc_ext_type_t::ext_rec_tas:
       ret = 100;
       break;
-    case IgcFormat::igc_ext_type_t::ext_rec_vat:
+    case igc_ext_type_t::ext_rec_vat:
       ret = 10;
       break;
-    case IgcFormat::igc_ext_type_t::ext_rec_oat:
+    case igc_ext_type_t::ext_rec_oat:
       ret = 10;
       break;
-    case IgcFormat::igc_ext_type_t::ext_rec_trt:
+    case igc_ext_type_t::ext_rec_trt:
       ret = 1;
       break;
-    case IgcFormat::igc_ext_type_t::ext_rec_gsp:
+    case igc_ext_type_t::ext_rec_gsp:
       ret = 100;
       break;
-    case IgcFormat::igc_ext_type_t::ext_rec_fxa:
+    case igc_ext_type_t::ext_rec_fxa:
       ret = 1;
       break;
-    case IgcFormat::igc_ext_type_t::ext_rec_siu:
+    case igc_ext_type_t::ext_rec_siu:
       ret = 1;
       break;
-    case IgcFormat::igc_ext_type_t::ext_rec_acz:
+    case igc_ext_type_t::ext_rec_acz:
       ret = 10;
       break;
-    case IgcFormat::igc_ext_type_t::ext_rec_gfo:
+    case igc_ext_type_t::ext_rec_gfo:
       ret = 1;
       break;
     default:

diff --git a/jeeps/gps.h b/jeeps/gps.h
index 1efc420d9b20642f71e2fa5382d68929740b2236..951d8263ad485923ed3422fabe9af8c5d6964a7d 100644 (file)
--- a/jeeps/gps.h
+++ b/jeeps/gps.h
@@ -247,7 +247,7 @@ typedef struct GPS_SCourse_Limits {
 } GPS_OCourse_Limits, *GPS_PCourse_Limits;
 
 
-typedef int (*pcb_fn)(int, struct GPS_SWay**);
+typedef int (*pcb_fn)(int, GPS_SWay**);
 
 #include "jeeps/gpsdevice.h"
 #include "jeeps/gpssend.h"
@@ -270,9 +270,9 @@ extern char   gps_save_string[GPS_ARB_LEN];
 extern int gps_is_usb;
 extern int gps_baud_rate;
 
-extern struct COMMANDDATA COMMAND_ID[2];
-extern struct LINKDATA LINK_ID[3];
-extern struct GPS_MODEL_PROTOCOL GPS_MP[];
+extern COMMANDDATA COMMAND_ID[2];
+extern LINKDATA LINK_ID[3];
+extern GPS_MODEL_PROTOCOL GPS_MP[];
 
 extern const char* gps_marine_sym[];
 extern const char* gps_land_sym[];

diff --git a/jeeps/gpsapp.cc b/jeeps/gpsapp.cc
index 0eb1159393b181cbaa8c73d02795486b3cf97472..914b7e1c69a7047fb80a4de4b9c39d73f74aaeb3 100644 (file)
--- a/jeeps/gpsapp.cc
+++ b/jeeps/gpsapp.cc
@@ -7571,7 +7571,7 @@ void GPS_Prepare_Track_For_Device(GPS_PTrack** trk, int32* n)
             trkpt->distance_populated = 0;
             trkpt->heartrate = 0;
             trkpt->cadence = 0xff;
-            *trk = (struct GPS_STrack**) xrealloc(*trk, (*n+1) * sizeof(GPS_PTrack));
+            *trk = (GPS_STrack**) xrealloc(*trk, (*n+1) * sizeof(GPS_PTrack));
             memmove(&(*trk)[i+1], &(*trk)[i], (*n-i) * sizeof(GPS_PTrack));
             (*trk)[i] = trkpt;
             i++;

diff --git a/jeeps/gpscom.cc b/jeeps/gpscom.cc
index f15c8f514ee82cf1095e18ba46b2cc159c7306db..6408edf38a7ddccdc093bff3bb282106098f304e 100644 (file)
--- a/jeeps/gpscom.cc
+++ b/jeeps/gpscom.cc
@@ -126,7 +126,7 @@ int32 GPS_Command_Get_Waypoint(const char* port, GPS_PWay** way, pcb_fn cb)
 ** @return [int32] success
 ************************************************************************/
 
-int32 GPS_Command_Send_Waypoint(const char* port, GPS_PWay* way, int32 n, int (*cb)(struct GPS_SWay**))
+int32 GPS_Command_Send_Waypoint(const char* port, GPS_PWay* way, int32 n, int (*cb)(GPS_SWay**))
 {
   int32 ret=0;
 
@@ -1189,7 +1189,7 @@ int32 GPS_Command_Send_Track_As_Course(const char* port, GPS_PTrack* trk, int32
     }
 
     /* Create & append course */
-    crs = (struct GPS_SCourse**)xrealloc(crs, (n_crs+1) * sizeof(GPS_PCourse));
+    crs = (GPS_SCourse**)xrealloc(crs, (n_crs+1) * sizeof(GPS_PCourse));
     crs[n_crs] = GPS_Course_New();
     if (!crs[n_crs]) {
       if (clp) xfree(clp);
@@ -1203,7 +1203,7 @@ int32 GPS_Command_Send_Track_As_Course(const char* port, GPS_PTrack* trk, int32
     crs[n_crs]->track_index = Unique_Track_Index(crs, n_crs);
 
     /* Create & append new lap */
-    clp = (struct GPS_SCourse_Lap**) xrealloc(clp, (n_clp+1) * sizeof(GPS_PCourse_Lap));
+    clp = (GPS_SCourse_Lap**) xrealloc(clp, (n_clp+1) * sizeof(GPS_PCourse_Lap));
     clp[n_clp] = GPS_Course_Lap_New();
     if (!clp[n_clp]) {
       if (clp) xfree(clp);
@@ -1218,7 +1218,7 @@ int32 GPS_Command_Send_Track_As_Course(const char* port, GPS_PTrack* trk, int32
   }
 
   /* Append new track points */
-  ctk = (struct GPS_STrack**) xrealloc(ctk, (n_ctk+n_trk) * sizeof(GPS_PTrack));
+  ctk = (GPS_STrack**) xrealloc(ctk, (n_ctk+n_trk) * sizeof(GPS_PTrack));
   first_new_ctk = n_ctk;
   for (i=0; i<n_trk; i++) {
     if (trk[i]->ishdr && (i>=n_trk || trk[i+1]->ishdr)) {
@@ -1245,7 +1245,7 @@ int32 GPS_Command_Send_Track_As_Course(const char* port, GPS_PTrack* trk, int32
   /* Convert waypoints to course points by searching closest track point &
    * append
    */
-  cpt = (struct GPS_SCourse_Point**) xrealloc(cpt, (n_cpt+n_wpt) * sizeof(GPS_PCourse_Point));
+  cpt = (GPS_SCourse_Point**) xrealloc(cpt, (n_cpt+n_wpt) * sizeof(GPS_PCourse_Point));
   for (i=0; i<n_wpt; i++) {
     double dist, min_dist = DBL_MAX;
     uint32 min_dist_idx = 0, trk_idx = 0, min_dist_trk_idx = 0;
@@ -1314,22 +1314,22 @@ int32 GPS_Command_Send_Track_As_Course(const char* port, GPS_PTrack* trk, int32
 }
 
 /*Stubs for unimplemented stuff*/
-int32  GPS_Command_Get_Workout(const char* /* port */, void** /* lap */, int (* /* cb */)(int, struct GPS_SWay**))
+int32  GPS_Command_Get_Workout(const char* /* port */, void** /* lap */, int (* /* cb */)(int, GPS_SWay**))
 {
   return 0;
 }
 
-int32  GPS_Command_Get_Fitness_User_Profile(const char* /* port */, void**  /* lap */, int (* /* cb */)(int, struct GPS_SWay**))
+int32  GPS_Command_Get_Fitness_User_Profile(const char* /* port */, void**  /* lap */, int (* /* cb */)(int, GPS_SWay**))
 {
   return 0;
 }
 
-int32  GPS_Command_Get_Workout_Limits(const char* /* port */, void** /* lap */, int (* /* cb */)(int, struct GPS_SWay**))
+int32  GPS_Command_Get_Workout_Limits(const char* /* port */, void** /* lap */, int (* /* cb */)(int, GPS_SWay**))
 {
   return 0;
 }
 
-int32  GPS_Command_Get_Course_Limits(const char* /* port */, void** /* lap */, int (* /* cb */)(int, struct GPS_SWay**))
+int32  GPS_Command_Get_Course_Limits(const char* /* port */, void** /* lap */, int (* /* cb */)(int, GPS_SWay**))
 {
   return 0;
 }

diff --git a/jeeps/gpscom.h b/jeeps/gpscom.h
index 5fcbe9a0a04181df02cae7c81ddf07ca06da9985..53ece39b7709191ce4523fadef0fdd7ccf136196 100644 (file)
--- a/jeeps/gpscom.h
+++ b/jeeps/gpscom.h
@@ -20,11 +20,11 @@
   int32  GPS_Command_Get_Almanac(const char* port, GPS_PAlmanac** alm);
   int32  GPS_Command_Send_Almanac(const char* port, GPS_PAlmanac* alm, int32 n);
 
-  int32  GPS_Command_Get_Track(const char* port, GPS_PTrack** trk, int (*cb)(int, struct GPS_SWay**));
+  int32  GPS_Command_Get_Track(const char* port, GPS_PTrack** trk, int (*cb)(int, GPS_SWay**));
   int32  GPS_Command_Send_Track(const char* port, GPS_PTrack* trk, int32 n, int eraset);
 
-  int32  GPS_Command_Get_Waypoint(const char* port, GPS_PWay** way,int (*cb)(int, struct GPS_SWay**));
-  int32  GPS_Command_Send_Waypoint(const char* port, GPS_PWay* way, int32 n, int (*cb)(struct GPS_SWay**));
+  int32  GPS_Command_Get_Waypoint(const char* port, GPS_PWay** way,int (*cb)(int, GPS_SWay**));
+  int32  GPS_Command_Send_Waypoint(const char* port, GPS_PWay* way, int32 n, int (*cb)(GPS_SWay**));
 
   int32  GPS_Command_Get_Proximity(const char* port, GPS_PWay** way);
   int32  GPS_Command_Send_Proximity(const char* port, GPS_PWay* way, int32 n);
@@ -32,7 +32,7 @@
   int32  GPS_Command_Get_Route(const char* port, GPS_PWay** way);
   int32  GPS_Command_Send_Route(const char* port, GPS_PWay* way, int32 n);
 
-  int32  GPS_Command_Get_Lap(const char* port, GPS_PLap** lap, int (*cb)(int, struct GPS_SWay**));
+  int32  GPS_Command_Get_Lap(const char* port, GPS_PLap** lap, int (*cb)(int, GPS_SWay**));
 
   int32  GPS_Command_Send_Course(const char* port, GPS_PCourse* crs, GPS_PCourse_Lap* clp,
                                  GPS_PTrack* trk, GPS_PCourse_Point* cpt,
@@ -40,8 +40,8 @@
   int32  GPS_Command_Send_Track_As_Course(const char* port, GPS_PTrack* trk, int32 n_trk,
                                           GPS_PWay* wpt, int32 n_wpt, int eraset);
 
-  int32  GPS_Command_Get_Workout(const char* port, void** lap, int (*cb)(int, struct GPS_SWay**));
-  int32  GPS_Command_Get_Fitness_User_Profile(const char* port, void** lap, int (*cb)(int, struct GPS_SWay**));
-  int32  GPS_Command_Get_Workout_Limits(const char* port, void** lap, int (*cb)(int, struct GPS_SWay**));
-  int32  GPS_Command_Get_Course_Limits(const char* port, void** lap, int (*cb)(int, struct GPS_SWay**));
+  int32  GPS_Command_Get_Workout(const char* port, void** lap, int (*cb)(int, GPS_SWay**));
+  int32  GPS_Command_Get_Fitness_User_Profile(const char* port, void** lap, int (*cb)(int, GPS_SWay**));
+  int32  GPS_Command_Get_Workout_Limits(const char* port, void** lap, int (*cb)(int, GPS_SWay**));
+  int32  GPS_Command_Get_Course_Limits(const char* port, void** lap, int (*cb)(int, GPS_SWay**));
 #endif

diff --git a/jeeps/gpsprot.cc b/jeeps/gpsprot.cc
index d27dd26af850f2b7ece9155b2629ab938db4ece9..f61bcf88d47e63ac412ddc2f7ca06a11d7381d02 100644 (file)
--- a/jeeps/gpsprot.cc
+++ b/jeeps/gpsprot.cc
@@ -34,8 +34,7 @@ static int32 gps_tag_data_unknown[GPS_TAGUNK];
 static int32 gps_n_tag_unknown = 0;
 
 
-
-struct COMMANDDATA COMMAND_ID[2]= {
+COMMANDDATA COMMAND_ID[2]= {
   /* Device Command Protocol 1 (A010) */
   {
     0,1,2,3,4,5,6,7,8,49,50,92,117,121,450,451,452,453,454,561,562,563,564,565
@@ -47,7 +46,7 @@ struct COMMANDDATA COMMAND_ID[2]= {
   }
 };
 
-struct LINKDATA LINK_ID[3]= {
+LINKDATA LINK_ID[3]= {
   /* Basic Link Protocol (L000) */
   {
     253,254,255,248,
@@ -73,7 +72,7 @@ struct LINKDATA LINK_ID[3]= {
   }
 };
 
-struct GPS_MODEL_PROTOCOL GPS_MP[]= {
+GPS_MODEL_PROTOCOL GPS_MP[]= {
   {
     7,pL001,pA010,pA100,pD100,pA200,pD200,-1,-1,-1,-1,-1,
     pA500,pD500

diff --git a/jeeps/gpsusbcommon.h b/jeeps/gpsusbcommon.h
index 0dee7e751c84c963bcd031a80536a8a237652931..df07c4ae532f9c5685205ee30dfffc9c0e48cb6d 100644 (file)
--- a/jeeps/gpsusbcommon.h
+++ b/jeeps/gpsusbcommon.h
@@ -37,7 +37,7 @@ typedef struct gusb_llops {
 
 /* Provided by the common code. */
 void gusb_syncup();
-void gusb_register_ll(struct gusb_llops*);
+void gusb_register_ll(gusb_llops*);
 void gusb_list_units();
 
 /* Provided by the OS layers */

diff --git a/mkshort.h b/mkshort.h
index a672a0d48aee91ee3e40966b7d3c48339c52abd0..8086adfc30f74ac941667ce861660b3ed35fbf0f 100644 (file)
--- a/mkshort.h
+++ b/mkshort.h
@@ -83,7 +83,7 @@ private:
 
   static const QByteArray vowels;
   static constexpr int default_target_len = 8;
-  static constexpr const char default_badchars[] = "\"$.,'!-";
+  static constexpr char default_badchars[] = "\"$.,'!-";
   static const QVector<replacement_t> replacements;
 
   /* Member Functions */

diff --git a/mtk_logger.cc b/mtk_logger.cc
index c67605a79a847498999746710f158a0f96a5a2f4..1838a018d6b248107f8cc53dfba2e26829aa7402 100644 (file)
--- a/mtk_logger.cc
+++ b/mtk_logger.cc
@@ -202,7 +202,7 @@ struct data_item {
   short rcr;
   unsigned short timestamp_ms;
   double distance;
-  struct sat_info sat_data[32];
+  sat_info sat_data[32];
 };
 
 struct mtk_loginfo {
@@ -235,9 +235,9 @@ static char* OPT_erase_only;  /* erase_only ? command option */
 static char* OPT_log_enable;  /* enable ? command option */
 static char* csv_file; /* csv ? command option */
 static char* OPT_block_size_kb; /* block_size_kb ? command option */
-static enum MTK_DEVICE_TYPE mtk_device = MTK_LOGGER;
+static MTK_DEVICE_TYPE mtk_device = MTK_LOGGER;
 
-static struct mtk_loginfo mtk_info;
+static mtk_loginfo mtk_info;
 
 const char LIVE_CHAR[4] = {'-', '\\','|','/'};
 
@@ -796,7 +796,7 @@ mtk_retry:
 
 
 static route_head*  trk_head = nullptr;
-static int add_trackpoint(int idx, unsigned long bmask, struct data_item* itm)
+static int add_trackpoint(int idx, unsigned long bmask, data_item* itm)
 {
   auto* trk = new Waypoint;
 
@@ -978,7 +978,7 @@ static void mtk_csv_deinit()
 }
 
 /* Output a single data line in MTK application compatible format - i.e ignore any locale settings... */
-static int csv_line(gbfile* csvFile, int idx, unsigned long bmask, struct data_item* itm)
+static int csv_line(gbfile* csvFile, int idx, unsigned long bmask, data_item* itm)
 {
   const char* fix_str = "";
   if (bmask & (1U<<VALID)) {
@@ -1111,7 +1111,7 @@ static int mtk_parse(unsigned char* data, int dataLen, unsigned int bmask)
   int sat_id;
   int hspd;
   unsigned char hbuf[4];
-  struct data_item itm;
+  data_item itm;
 
   dbg(5,"Entering mtk_parse, count = %i, dataLen = %i\n", count, dataLen);
   if (global_opts.debug_level > 5) {

diff --git a/skytraq.cc b/skytraq.cc
index fe4ebb63a4d364693b41ecda57d29f57d8116cc0..eca79199c9888a705ee827b3b30ac5ca6611377a 100644 (file)
--- a/skytraq.cc
+++ b/skytraq.cc
@@ -581,7 +581,7 @@ SkytraqBase::ECEF_to_LLA(double x, double y, long z, double* lat, double* lon, d
 }
 
 void
-SkytraqBase::state_init(struct read_state* pst)
+SkytraqBase::state_init(read_state* pst)
 {
   auto* track = new route_head;
   track->rte_name = "SkyTraq tracklog";
@@ -600,7 +600,7 @@ SkytraqBase::state_init(struct read_state* pst)
 }
 
 Waypoint*
-SkytraqBase::make_trackpoint(struct read_state* st, double lat, double lon, double alt) const
+SkytraqBase::make_trackpoint(read_state* st, double lat, double lon, double alt) const
 {
   auto* wpt = new Waypoint;
 
@@ -623,7 +623,7 @@ SkytraqBase::make_trackpoint(struct read_state* st, double lat, double lon, doub
 #define ITEM_SPEED(item) (item->type_and_speed[1] | ((item->type_and_speed[0] & 0x0F) << 8))
 
 int
-SkytraqBase::process_data_item(struct read_state* pst, const item_frame* pitem, int len) const
+SkytraqBase::process_data_item(read_state* pst, const item_frame* pitem, int len) const
 {
   int res = 0;
   double lat;
@@ -766,7 +766,7 @@ SkytraqBase::process_data_item(struct read_state* pst, const item_frame* pitem,
 }
 
 int    /* returns number of bytes processed (terminates on 0xFF i.e. empty or padding bytes) */
-SkytraqBase::process_data_sector(struct read_state* pst, const uint8_t* buf, int len) const
+SkytraqBase::process_data_sector(read_state* pst, const uint8_t* buf, int len) const
 {
   int plen, ilen;
 
@@ -924,7 +924,7 @@ SkytraqBase::skytraq_read_multiple_sectors(int first_sector, unsigned int sector
 void
 SkytraqBase::skytraq_read_tracks() const
 {
-  struct read_state st;
+  read_state st;
   uint32_t log_wr_ptr;
   uint16_t sectors_free, sectors_total, /*sectors_used_a, sectors_used_b,*/ sectors_used;
   int t, rc, got_sectors, total_sectors_read = 0;
@@ -1240,7 +1240,7 @@ SkytraqfileFormat::rd_deinit()
 void
 SkytraqfileFormat::read()
 {
-  struct read_state st;
+  read_state st;
   int got_bytes;
   int opt_first_sector_val = xstrtoi(opt_first_sector, nullptr, 10);
   int opt_last_sector_val = xstrtoi(opt_last_sector, nullptr, 10);

diff --git a/v900.cc b/v900.cc
index e11129041432e5a25d25c38ff4c82f1eeb44396c..632195221a068739a7e9ca4213f908d88de9a8bf 100644 (file)
--- a/v900.cc
+++ b/v900.cc
@@ -109,7 +109,7 @@ struct one_line_common_start {
 1717**,T,090204,062634,31.765528N,035.207730E,772**,0***,0**,2D,SPS ,2.1**,1.9**,1.0**,*********
 */
 struct one_line_advanced_mode {
-  struct one_line_common_start common;
+  one_line_common_start common;
   char fixmode[2]; /* "2D" or "3D" */
   char comma10;    /* ',' */
   char valid[4];   /* "SPS " or "DGPS" */
@@ -130,7 +130,7 @@ struct one_line_advanced_mode {
 1*****,T,090404,063401,31.765931N,035.206969E,821**,0***,0**,*********
 */
 struct one_line_basic_mode {
-  struct one_line_common_start common;
+  one_line_common_start common;
   char vox[9];    /* voicetag recorded */
   char cr;        /* '\r' */
   char lf;        /* '\n' */
@@ -203,8 +203,8 @@ v900_read()
 {
   /* use line buffer large enough to hold either basic or advanced mode lines. */
   union {
-    struct one_line_basic_mode    bas;
-    struct one_line_advanced_mode adv;
+    one_line_basic_mode    bas;
+    one_line_advanced_mode adv;
     char text[200]; /* used to read the header line, which is normal text */
   } line;
   int lc = 0;